81a45513f044ba62ff5956b499d5cfc0d69e8f2d,framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java,MacroScreenRenderer,renderContentEnd,#Appendable#Map#ModelScreenWidget.Content#,458
Before Change
String expandedContentId = content.getContentId(context);
String editMode = "Edit";
String editRequest = content.getEditRequest(context);
String editContainerStyle = content.getEditContainerStyle(context);
String enableEditName = content.getEnableEditName(context);
String enableEditValue = (String)context.get(enableEditName);
String urlString = "";
if (editRequest != null && editRequest.toUpperCase().indexOf("IMAGE") > 0) {
editMode += " Image";
}
if (UtilValidate.isNotEmpty(editRequest) && "true".equals(enableEditValue)) {
HttpServletResponse response = (HttpServletResponse) context.get("response");
HttpServletRequest request = (HttpServletRequest) context.get("request");
if (request != null && response != null) {
if (editRequest.indexOf("?") < 0) editRequest += "?";
else editRequest += "&";
editRequest += "contentId=" + expandedContentId;
ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
urlString = rh.makeLink(request, response, editRequest, false, false, false);
}
StringWriter sr = new StringWriter();
sr.append("<@renderContentEnd ");
sr.append("urlString=\"");
sr.append(urlString);
sr.append("\" editMode=\"");
sr.append(editMode);
sr.append("\" editContainerStyle=\"");
sr.append(editContainerStyle);
sr.append("\" editRequest=\"");
sr.append(editRequest);
sr.append("\" enableEditValue=\"");
sr.append(enableEditValue);
sr.append("\" />");
executeMacro(writer, sr.toString());
}
}
After Change
editRequest += "contentId=" + expandedContentId;
ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
urlString = rh.makeLink(request, response, editRequest, false, false, false);
}
Map<String, Object> parameters = FastMap.newInstance();
parameters.put("urlString", urlString);
parameters.put("editMode", editMode);
parameters.put("editContainerStyle", content.getEditContainerStyle(context));
parameters.put("editRequest", editRequest);
parameters.put("enableEditValue", enableEditValue);
executeMacro(writer, "renderContentEnd", parameters);
}
}